From ffb974095f3e5cf081d997924439eb743f9d7e58 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 28 Jul 2006 17:33:26 +0100 Subject: [PATCH] [TPM] Remove some stale code from the TPM backend driver. The code used to be used for sending of vTPM control commands, but now this is all done with the hotplug scripts. Signed-off-by: Stefan Berger --- linux-2.6-xen-sparse/drivers/xen/Kconfig | 9 ----- .../drivers/xen/tpmback/tpmback.c | 39 ------------------- 2 files changed, 48 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/Kconfig b/linux-2.6-xen-sparse/drivers/xen/Kconfig index 39d316205a..b8a9479927 100644 --- a/linux-2.6-xen-sparse/drivers/xen/Kconfig +++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig @@ -143,15 +143,6 @@ config XEN_TPMDEV_BACKEND help The TPM-device backend driver -config XEN_TPMDEV_CLOSE_IF_VTPM_FAILS - bool "TPM backend closes upon vTPM failure" - depends on XEN_TPMDEV_BACKEND - default n - help - The TPM backend closes the channel if the vTPM in userspace indicates - a failure. The corresponding domain's channel will be closed. - Say Y if you want this feature. - config XEN_BLKDEV_FRONTEND tristate "Block-device frontend driver" depends on XEN diff --git a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c index f792a4cf35..466c3ee581 100644 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c @@ -55,7 +55,6 @@ struct packet { enum { PACKET_FLAG_DISCARD_RESPONSE = 1, - PACKET_FLAG_CHECK_RESPONSESTATUS = 2, }; /* local variables */ @@ -201,21 +200,6 @@ static void packet_free(struct packet *pak) kfree(pak); } -static int packet_set(struct packet *pak, - const unsigned char *buffer, u32 size) -{ - int rc = 0; - unsigned char *buf = kmalloc(size, GFP_KERNEL); - - if (buf) { - pak->data_buffer = buf; - memcpy(buf, buffer, size); - pak->data_len = size; - } else { - rc = -ENOMEM; - } - return rc; -} /* * Write data to the shared memory and send it to the FE. @@ -225,29 +209,6 @@ static int packet_write(struct packet *pak, { int rc = 0; - if ((pak->flags & PACKET_FLAG_CHECK_RESPONSESTATUS)) { -#ifdef CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS - u32 res; - - if (copy_from_buffer(&res, - &data[2 + 4], sizeof (res), - isuserbuffer)) { - return -EFAULT; - } - - if (res != 0) { - /* - * Close down this device. Should have the - * FE notified about closure. - */ - if (!pak->tpmif) { - return -EFAULT; - } - pak->tpmif->status = DISCONNECTING; - } -#endif - } - if (0 != (pak->flags & PACKET_FLAG_DISCARD_RESPONSE)) { /* Don't send a respone to this packet. Just acknowledge it. */ rc = size; -- 2.30.2